Merge pull request #973 from cantino/remove_spring
Remove spring because it frequently conflicts with foreman
Andrew Cantino
7 changed files with 2 additions and 36 deletions
+ 0
- 2
Gemfile
@@ -113,8 +113,6 @@ group :development do |
||
| 113 | 113 |
gem 'rspec-rails', '~> 3.1' |
| 114 | 114 |
gem 'rspec-html-matchers', '~> 0.7' |
| 115 | 115 |
gem 'shoulda-matchers' |
| 116 |
- gem 'spring', '~> 1.3.0' |
|
| 117 |
- gem 'spring-commands-rspec' |
|
| 118 | 116 |
gem 'vcr' |
| 119 | 117 |
gem 'webmock', '~> 1.17.4', require: false |
| 120 | 118 |
end |
+ 1
- 6
Gemfile.lock
@@ -419,9 +419,6 @@ GEM |
||
| 419 | 419 |
slop (3.6.0) |
| 420 | 420 |
spectrum-rails (1.3.4) |
| 421 | 421 |
railties (>= 3.1) |
| 422 |
- spring (1.3.6) |
|
| 423 |
- spring-commands-rspec (1.0.4) |
|
| 424 |
- spring (>= 0.9.1) |
|
| 425 | 422 |
sprockets (3.2.0) |
| 426 | 423 |
rack (~> 1.0) |
| 427 | 424 |
sprockets-rails (2.3.1) |
@@ -569,8 +566,6 @@ DEPENDENCIES |
||
| 569 | 566 |
shoulda-matchers |
| 570 | 567 |
slack-notifier (~> 1.0.0) |
| 571 | 568 |
spectrum-rails |
| 572 |
- spring (~> 1.3.0) |
|
| 573 |
- spring-commands-rspec |
|
| 574 | 569 |
string-scrub |
| 575 | 570 |
therubyracer (~> 0.12.2) |
| 576 | 571 |
tumblr_client |
@@ -589,4 +584,4 @@ DEPENDENCIES |
||
| 589 | 584 |
xmpp4r (~> 0.5.6) |
| 590 | 585 |
|
| 591 | 586 |
BUNDLED WITH |
| 592 |
- 1.10.5 |
|
| 587 |
+ 1.10.6 |
+ 1
- 1
Guardfile
@@ -8,7 +8,7 @@ guard 'livereload' do |
||
| 8 | 8 |
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
|
| 9 | 9 |
end |
| 10 | 10 |
|
| 11 |
-guard :rspec, cmd: 'bundle exec spring rspec' do |
|
| 11 |
+guard :rspec, cmd: 'bundle exec rspec' do |
|
| 12 | 12 |
watch(%r{^spec/.+_spec\.rb$})
|
| 13 | 13 |
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
|
| 14 | 14 |
watch('spec/spec_helper.rb') { "spec" }
|
+ 0
- 4
bin/rails
@@ -1,8 +1,4 @@ |
||
| 1 | 1 |
#!/usr/bin/env ruby |
| 2 |
-begin |
|
| 3 |
- load File.expand_path("../spring", __FILE__)
|
|
| 4 |
-rescue LoadError |
|
| 5 |
-end |
|
| 6 | 2 |
APP_PATH = File.expand_path('../../config/application', __FILE__)
|
| 7 | 3 |
require_relative '../config/boot' |
| 8 | 4 |
require 'rails/commands' |
+ 0
- 4
bin/rake
@@ -1,8 +1,4 @@ |
||
| 1 | 1 |
#!/usr/bin/env ruby |
| 2 |
-begin |
|
| 3 |
- load File.expand_path("../spring", __FILE__)
|
|
| 4 |
-rescue LoadError |
|
| 5 |
-end |
|
| 6 | 2 |
require_relative '../config/boot' |
| 7 | 3 |
require 'rake' |
| 8 | 4 |
Rake.application.run |
+ 0
- 4
bin/rspec
@@ -1,7 +1,3 @@ |
||
| 1 | 1 |
#!/usr/bin/env ruby |
| 2 |
-begin |
|
| 3 |
- load File.expand_path("../spring", __FILE__)
|
|
| 4 |
-rescue LoadError |
|
| 5 |
-end |
|
| 6 | 2 |
require 'bundler/setup' |
| 7 | 3 |
load Gem.bin_path('rspec-core', 'rspec')
|
+ 0
- 15
bin/spring
@@ -1,15 +0,0 @@ |
||
| 1 |
-#!/usr/bin/env ruby |
|
| 2 |
- |
|
| 3 |
-# This file loads spring without using Bundler, in order to be fast. |
|
| 4 |
-# It gets overwritten when you run the `spring binstub` command. |
|
| 5 |
- |
|
| 6 |
-unless defined?(Spring) |
|
| 7 |
- require "rubygems" |
|
| 8 |
- require "bundler" |
|
| 9 |
- |
|
| 10 |
- if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) |
|
| 11 |
- Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
|
|
| 12 |
- gem "spring", match[1] |
|
| 13 |
- require "spring/binstub" |
|
| 14 |
- end |
|
| 15 |
-end |